Merge from emacs-23 branch
authorChong Yidong <cyd@stupidchicken.com>
Tue, 9 Aug 2011 22:13:11 +0000 (18:13 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Tue, 9 Aug 2011 22:13:11 +0000 (18:13 -0400)
commit1b3d531f9c51e73589fdcc92b19468efd712ee66
tree568a27155c760ffaf7145c0d5573c225211a8f8e
parent3f3944ac00abb4fd2bb7bff1eb268e5860f85062
parent04e7a73457222f2e440e27b99c85901e616663ba
Merge from emacs-23 branch
lisp/ChangeLog
lisp/hi-lock.el
lisp/xt-mouse.el
src/ChangeLog
src/fontset.c
src/unexmacosx.c